Merge remote-tracking branch 'savannah/master' into native-comp

diff --cc etc/NEWS
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/gnus/gnus.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/w32common.h
Simple merge

diff --cc test/Makefile.in
Simple merge